bitkeeper revision 1.1159.1.293 (4180123d6fy9CmhZFhA2dxg-C2tnig)

create.py:
  Set the name of the vm to the config file's basename if no name is
  specified in the config file or on the commandline.
opts.py:
  Handle trailing getopt arguments correctly.

diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index 1c0fa6cb4f8b8f26e610f4ddc1d799773cd1b33d..9d977dd337104d5af77b5b1c60d59760911de861 100644 (file)
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -465,6 +465,8 @@ def main(argv):
     else:
         opts.load_defconfig()
         preprocess(opts, opts.vals)
+        if not opts.getopt('name') and opts.getopt('defconfig'):
+            opts.setopt('name', os.path.basename(opts.getopt('defconfig')))
         config = make_config(opts.vals)
     if opts.vals.dryrun:
         PrettyPrint.prettyprint(config)

diff --git a/tools/python/xen/xm/opts.py b/tools/python/xen/xm/opts.py
index 0dfee0b7c9ae8af9ebff22d35f238f137d139d7b..f92c82dfe6984f490dda1814dc16b4e3a40d490c 100644 (file)
--- a/tools/python/xen/xm/opts.py
+++ b/tools/python/xen/xm/opts.py
@@ -313,6 +313,9 @@ class Opts:
                     print >>sys.stderr, "Error: Unknown option:", k
                     self.usage()
 
+            if not args:
+                break
+            
             # then process the 1st arg 
             (arg,args) = (args[0], args[1:])